feat: check local branch state when creating comments#533
Open
jakubbortlik wants to merge 2 commits intoharrisoncramer:developfrom
Open
feat: check local branch state when creating comments#533jakubbortlik wants to merge 2 commits intoharrisoncramer:developfrom
jakubbortlik wants to merge 2 commits intoharrisoncramer:developfrom
Conversation
jakubbortlik
commented
Mar 2, 2026
| ---@param current_branch string|nil | ||
| ---@param remote_branch string|nil | ||
| ---@return integer|nil ahead, integer|nil behind | ||
| M.get_ahead_behind = function(current_branch, remote_branch) |
Collaborator
Author
There was a problem hiding this comment.
This function is refactored to only get the number of commits and not show warnings to the user so that it can be used more often without annoying the user. The notification is moved up to the check_current_branch_up_to_date_on_remote function.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Comment creation sometimes crashes when the local branch is not up-to-date with the remote, sometimes a comment is created on the wrong line when the file has been updated on remote.
The out-of-sync state is reported when the reviewer is initiated, but it should be checked more regularly, so this PR introduces checking of "ahead" and "behind" commits:
The "ahead" and "behind" commits are now shown in the winbar of the discussion tree. To make it fit more easily, I've changed the section "Inline Comments" to just "Comments".